Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <[email protected]>
Wed, 3 Feb 2010 19:15:46 +0000 (20:15 +0100)
committerWolfgang Denk <[email protected]>
Wed, 3 Feb 2010 19:15:46 +0000 (20:15 +0100)

Trivial merge